* lisp.h (WIDE_EMACS_INT): Now defaults to 1.

diff --cc src/ChangeLog
index ee549eeb9e2928fe124a55e5ce3d2dcff151b826,36800712203c49645128dfd529406f740d4731e2..a47f59be7f9e51b6bc8d8ffa37c07dc09cabc1da
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
 -2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 +2011-06-03  Paul Eggert  <eggert@cs.ucla.edu>
  
+       * lisp.h (WIDE_EMACS_INT): Now defaults to 1.
+ 
 +      * xselect.c: Use 'unsigned' more consistently.
 +      (selection_data_to_lisp_data, lisp_data_to_selection_data):
 +      Use 'unsigned' consistently when computing sizes of unsigned objects.
 +
        * fileio.c (Fverify_visited_file_modtime): Avoid time overflow
        if b->modtime has its maximal value.
  

diff --cc src/lisp.h
Simple merge